GtkStyle: Fill in x/ythickness and font_desc from the style context.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 9b257ca43f7b9d3c001803c295c505ad0a9e1bbe..941ff79018a26fbfec9bfde0d4d0938ce3f61477 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1783,6 +1783,7 @@ gtk_css_provider_get_default (void)
         "  foreground-color: @fg_color;\n"
         "  text-color: @text_color; \n"
         "  base-color: @base_color; \n"
+        "  padding: 2 2; \n"
         "}\n"
         "\n"
         "*:prelight {\n"

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index c4056702da7181559589e796b07fe5888dc9f4d4..310da02ff4dc4bf87793b03788e8a9260568858a 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -685,6 +685,7 @@ gtk_style_update_from_context (GtkStyle *style)
 {
   GtkStylePrivate *priv;
   GtkStateType state;
+  GtkBorder *padding;
 
   priv = GTK_STYLE_GET_PRIVATE (style);
 
@@ -696,7 +697,18 @@ gtk_style_update_from_context (GtkStyle *style)
       set_color (style, priv->context, state, GTK_RC_TEXT);
     }
 
-  /* FIXME: thickness, font_desc */
+  if (style->font_desc)
+    pango_font_description_free (style->font_desc);
+
+  gtk_style_context_get (priv->context, state,
+                         "font", &style->font_desc,
+                         "padding", &padding,
+                         NULL);
+
+  style->xthickness = padding->left;
+  style->ythickness = padding->top;
+
+  gtk_border_free (padding);
 }
 
 static void